gdk-pixbuf/Makefile.am (gdk_pixbuf.def) gdk/Makefile.am (gdk.def) Work

2004-12-03  Tor Lillqvist  <tml@iki.fi>

	* gdk-pixbuf/Makefile.am (gdk_pixbuf.def)
	* gdk/Makefile.am (gdk.def)
	* gtk/Makefile.am (gtk.def): Work around gcc misfeature. At least
	gcc 3.3.1 doesn't like to do -E on files that it thinks aren't
	source files. Use redirection and '-' instead.

diff --git a/ChangeLog b/ChangeLog
index 26458ec94f814504a80cf8d040439566a80a22bc..0f00b80e6ef053c5c183211faf6a4490bc59737a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-12-03  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk-pixbuf/Makefile.am (gdk_pixbuf.def)
+       * gdk/Makefile.am (gdk.def)
+       * gtk/Makefile.am (gtk.def): Work around gcc misfeature. At least
+       gcc 3.3.1 doesn't like to do -E on files that it thinks aren't
+       source files. Use redirection and '-' instead.
+
 2004-12-02  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_should_respond):        Reinstate the previous behavior for clicking Ok after

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 26458ec94f814504a80cf8d040439566a80a22bc..0f00b80e6ef053c5c183211faf6a4490bc59737a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2004-12-03  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk-pixbuf/Makefile.am (gdk_pixbuf.def)
+       * gdk/Makefile.am (gdk.def)
+       * gtk/Makefile.am (gtk.def): Work around gcc misfeature. At least
+       gcc 3.3.1 doesn't like to do -E on files that it thinks aren't
+       source files. Use redirection and '-' instead.
+
 2004-12-02  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_should_respond):        Reinstate the previous behavior for clicking Ok after

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 26458ec94f814504a80cf8d040439566a80a22bc..0f00b80e6ef053c5c183211faf6a4490bc59737a 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+2004-12-03  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk-pixbuf/Makefile.am (gdk_pixbuf.def)
+       * gdk/Makefile.am (gdk.def)
+       * gtk/Makefile.am (gtk.def): Work around gcc misfeature. At least
+       gcc 3.3.1 doesn't like to do -E on files that it thinks aren't
+       source files. Use redirection and '-' instead.
+
 2004-12-02  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_should_respond):        Reinstate the previous behavior for clicking Ok after

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 26458ec94f814504a80cf8d040439566a80a22bc..0f00b80e6ef053c5c183211faf6a4490bc59737a 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+2004-12-03  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk-pixbuf/Makefile.am (gdk_pixbuf.def)
+       * gdk/Makefile.am (gdk.def)
+       * gtk/Makefile.am (gtk.def): Work around gcc misfeature. At least
+       gcc 3.3.1 doesn't like to do -E on files that it thinks aren't
+       source files. Use redirection and '-' instead.
+
 2004-12-02  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_should_respond):        Reinstate the previous behavior for clicking Ok after

diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index 55ed65ba89e8dc21801bcc896ea559549506398b..090c5419b2aee38c1d4c218801b677165678d7f6 100644 (file)
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -40,7 +40,7 @@ uninstall-ms-lib:
 endif
 
 gdk_pixbuf.def: gdk-pixbuf.symbols
-       (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES $(srcdir)/gdk-pixbuf.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g') > gdk_pixbuf.def
+       (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES - <$(srcdir)/gdk-pixbuf.symbols | sed -e '/^$$/d' -e 's/^/      /' -e 's/G_GNUC_[^ ]*//g') > gdk_pixbuf.def
 
 gdk-pixbuf-alias.h: gdk-pixbuf.symbols
         $(PERL) $(srcdir)/makegdkpixbufalias.pl < $(srcdir)/gdk-pixbuf.symbols > gdk-pixbuf-alias.h

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 8e69a3aba200c8c4c60aa19e3577126cff919c5b..acd669f2049a168b644236b551b47a1fc74b9ec0 100644 (file)
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -177,7 +177,7 @@ uninstall-ms-lib:
 endif
 
 gdk.def: gdk.symbols
-       (echo -e EXPORTS; $(CPP) -P -DGDK_WINDOWING_WIN32 -DINCLUDE_VARIABLES $(srcdir)/gdk.symbols | sed -e '/^$$/d' -e 's/^/  /' -e 's/G_GNUC_[^ ]*//g') > gdk.def
+       (echo -e EXPORTS; $(CPP) -P -DGDK_WINDOWING_WIN32 -DINCLUDE_VARIABLES - <$(srcdir)/gdk.symbols | sed -e '/^$$/d' -e 's/^/       /' -e 's/G_GNUC_[^ ]*//g') > gdk.def
 
 gdkalias.h: gdk.symbols
         $(PERL) $(srcdir)/makegdkalias.pl < $(srcdir)/gdk.symbols > gdkalias.h

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 099043440246360514bc377ae5c5405ba43bd6f4..79dead6416efe8321fabdd88be28b9e5604c4a8f 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -71,7 +71,7 @@ uninstall-ms-lib:
 endif
 
 gtk.def: gtk.symbols
-       (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DG_OS_WIN32 $(srcdir)/gtk.symbols | sed -e '/^$$/d' -e 's/^/   /' -e 's/G_GNUC_[^ ]*//g') > gtk.def
+       (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DG_OS_WIN32 - <$(srcdir)/gtk.symbols | sed -e '/^$$/d' -e 's/^/        /' -e 's/G_GNUC_[^ ]*//g') > gtk.def
 
 gtkalias.h: gtk.symbols
          $(PERL) $(srcdir)/makegtkalias.pl < $(srcdir)/gtk.symbols > gtkalias.h